dataflash: Move CONFIG_HAS_DATAFLASH to Makefile

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile
index 952e9198437059c540cce55a369138809cbfd204..ff932a1b6bf02315d7fa7c167c4b904fa66b042d 100644 (file)
--- a/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
@@ -23,17 +23,17 @@
 
 include $(TOPDIR)/config.mk
 
-LIB    := $(obj)libmtd.a
+LIB    := $(obj)libmtd.a
 
 COBJS-y += at45.o
 COBJS-y += cfi_flash.o
-COBJS-y += dataflash.o
+COBJS-$(CONFIG_HAS_DATAFLASH) += dataflash.o
 COBJS-y += mw_eeprom.o
 COBJS-$(CONFIG_FLASH_CFI_LEGACY) += jedec_flash.o
 
 COBJS  := $(COBJS-y)
-SRCS   := $(COBJS:.o=.c)
-OBJS   := $(addprefix $(obj),$(COBJS))
+SRCS   := $(COBJS:.o=.c)
+OBJS   := $(addprefix $(obj),$(COBJS))
 
 all:   $(LIB)
 

diff --git a/drivers/mtd/dataflash.c b/drivers/mtd/dataflash.c
index 85cbc5f783febdb2d4a5c3d9c6313018ced39c2d..d8f78f20a8a192df41d3ab3b7eb3592f6bff3bfa 100644 (file)
--- a/drivers/mtd/dataflash.c
+++ b/drivers/mtd/dataflash.c
@@ -19,7 +19,6 @@
  */
 #include <common.h>
 #include <config.h>
-#ifdef CONFIG_HAS_DATAFLASH
 #include <asm/hardware.h>
 #include <dataflash.h>
 
@@ -475,5 +474,3 @@ void dataflash_perror (int err)
                break;
        }
 }
-
-#endif